From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 2 Jan 2011 20:31:19 +0000 (-0500)
Subject: Merge changes from emacs-23 branch
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5308
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c3eba83b44d49d3baa114e99bd12067d1d1e7087;p=emacs.git

Merge changes from emacs-23 branch
---

c3eba83b44d49d3baa114e99bd12067d1d1e7087
diff --cc lisp/mail/rmail.el
index 7b896e579bc,cfd4c7949f2..250481c20b5
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4289,7 -4286,7 +4286,7 @@@ With prefix argument N moves forward N 
  
  ;;;***
  
- ;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "b1ce015fd919b54cc7b1d0b2155489f9")
 -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5767ec9a393ef5ff12bc1a14d55c949e")
++;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "3735f9bfe6ff3e612091857cc6b401b6")
  ;;; Generated autoloads from rmailmm.el
  
  (autoload 'rmail-mime "rmailmm" "\